Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jan 2010 06:54:49 +0000 (06:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jan 2010 06:54:49 +0000 (06:54 +0000)
commit80e9680ec1720097f5d73397dd3eb8df56e02cb2
treeddfc95dbdebaabec3deb2955c30ac431e8b4b1de
parent0f25ba97442969e5423ab8a3d5e4593618056d9d
parent5c1aeaa16e15b5adf1aeb03c387f32a3de14646a
Merge from mainline.